From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 11 Jun 2011 03:34:13 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3476^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1138967d54b10ef3e45112449ec052ae000cc4ac;p=emacs.git

Merge from trunk.
---

1138967d54b10ef3e45112449ec052ae000cc4ac